fixes #653 issue