attempt to fix panic