Fixed #248