Fixed bassie bug