Fixed #168