Fixes #2616