Stuff

fixes #2217
fixes #2204