Fixes CanaryLib #67