Compatibility, fixes #9