Some debug fix