Fix issue#29