opensource version, people don't mind see the real errors! ;)
fix for wrong mapping (testing related)