Fixed some bug (1.1)