shit ain't working and I can't check out the master, maybe it will work after this commit...