fixes #612