Fixed #283