Fix for https://github.com/crossbridge-community/crossbridge/pull/64