Fixed #370