Full fix (12/16)

Full fix