fixed BUG