fixed #360