Fixed latest bug