Fixes #3260