Fixes #2753