Fix issue#24