Issue #388 - fixing a bug
Issue #388 - fixing a bug