fixed commit Jan 17, 2013 "works right now but not so gud (2)": e784afa41a6bba6b2223a6d9ab89ed16d4c82ed0