Full fix (16/16)

Full fix