Did some fix