fixes #409
Merging.
Merging.