Fixed my fix to really only use defaults when getCurrentPosition fails