bugfix

trying to fix bugs