Workshop G - fix