THX-257 fixing the fix