Fix wrong messages