Refining #15 fix.