bug fix for verion 1.1