fixes #501