CODE: same code as before temporary fix of BUG #1939