fixes #888 and #889