Full fix (7/16)

Full fix