this will hopefully fix a few things...