fixed BIG BUG