Fix for reply bug