fixes #481