fix issues #573