ITSUP-1672 Less insane logic