fixed #357
fixed #351