Added is_fresh check to prevent wrong message
merged in master and fixed conflicts