Fixed #342