fixed #567