Fixes #1320 again