This fixed #578.