Update fix based on feedback