Fixes #1542
flakes