I'm not sure I get what's going on here. If it's not possible currently probably better to just not have this extra logic.