Restored old reply behaviour