Discovered a bug in Settings Activity, temporary fix