Strict standart fix