Quick Fix for Year 6