Fixed nasty bug that crashed when entering the Settings page