Fixes #3092