Fix issue#25