fix issue12