Fixes #2233