Last fixes of this shit!