fix issue8