Fix for some mix ups with last checkin