Issue #488 fixed