fixed W293 violations