Issue #297 - Fixing a bug