Fixes #2674