fixes #250
merge