Fixed unexpected behavior