fixes #2116