Fixes #759

Needs binarization