Resolve Issue #2 by odebox