Commit: Bug fixed