Bug Fix: spinner no longer dissapears early