Full fix (9/16)

Full fix