LPS-44542 Compat
LPS-44542 One more check