Fixes #2666