Fixed fuzzy commit 9285075e2d66f396c

Closes #292