Fixing issue #207

Should be okay now.