Fixed an intermitant bug