this should fix a few things