less hacky find fix