really fix issue #264