attempted fixes for last commit