Issue #312 fixed