fixed logic at oclock