I addressed this in my latest patches. Please have a look