Should fix Issue #17