Fixed #71
Fixed #71 mkII