Semi fix to get stuff to work