fixed #574