Basic wrokaround on the next feature