fix issue#7