NEW: added patch to fix issue related to straightening