Fully fixed

v3.5