#995 in one commit