5.3.3 finally fixed