fixing it bug