FIX issue 458 (piggybacking it in this PR)