Unexpectedly re-introduced this bug