bug fixed - mostashafa commit