Code debug fix