bugfix
temp bug fix, need to rework a few things to make this not needed