Fixes #2663