fixed #541