fixes #499