Refactor workaround code
Merge pull request #94 from peco/refactor-workaround

Refactor workaround code