Fixes #2225