fixed 'frequent use' bug