bug fix V1.1