Fixed Annoying bug