Fixes #2656