Fixes #249
merge