Should fix Issue #33.