Changes:
 - Fix regression in settings screen