fixes #486