Fix one more WIP scenario