Fixed #360