Should fix Issue #21