Another small bug detected - added in TODO