Bug fix that would make te app crash because of the spinner