Fix issue#25 more