fixes #602