Issue #24 partial fix