fixes #653