Compliance, fixes #1

Or not