Random change that fixed bugs