Implements changes in Lib commit
https://github.com/FallenMoonNetwork/CanaryLib/commit/246d5980c46073a8ca88251dd5ad60e846b3fc4a