Fixes #2926