Issue #499 fixed