Fixed #377