Fixed bug during f7 and 8