removed unnecessary if check