Fix for https://github.com/ReadyTalk/avian/issues/216
Merge commit '61b1c9380551d14f48ed2158b310e67a79001a60' into avian-pack