Should fix Issue #114.