- fixed logic