Bug fix - misplaced  statement (#236)