Fixes #3388