Fixing issue #207

It seems okay now.