GH21 - fixed a small bug after merge