Fix it intersting little bug )