Should fix Issue #78