ULib fix - substitute of (#1083 #1122)