Fixed an bug (horrible bug)