fixed not working bug