bug fixed - Nazar