Issue #388 - fixing a bug