bug - fixed