Fixed #361