Fixes regression in #811