Fixing issue #107

why is this not optional anymore?