Re-commit of bug fixing