hmmm maybe a fix for the nullpointer their