issue 876 restore molly's changes