commander: brackets added to return switch check