Fixed #93