fixes #479