Should fix Issue #100