fixes #2226
fixes #2227