Additional fixes for HOPE fields