Should fix Issue #14