fix issue149