bug fixed (i hope)