added stuff to fix it