Update for cycle fix in Spring