fix issue#16