additions to: fixes #484