fixes #499
merge