Bugfix to LibCLH