Should fix Issue #9