code cleaned a little bit too much ;-)