Fixes #215 (although it should be made less sensitive to bit-errors)