Issue #856 was fixed.
Merged kmussel fix