Fixes CanaryLib Issue #87