Fix issue #252