#17 Bugfix the previous checkin didn't work