Fixed #350