resolve critic issues