Secondary fix for [Easy] 141