Fixed bug12