Fixes regression in #1011