*bug fixin, fucking bug fixin