Fixed bad bug