Bugfix on last checkin