Fixed bogey spinner issue (shitty fix - need to revisit)