Removed unnecessary if check