Fixed bug11