>>Some bugs fixed