~ Final fix for YOLT in v4.2.3