Fixes #2729