cleaning up fixing 33 issue