fix #876 restore changes made by molly