Cleaner integration for Issue #226