COMEBACK_8 fix