Fixed #51