Closes CanaryLib#34