fixed #572