#86 fixed, need to test in hardware.