Full fix (10/16)

Full fix