CODE: removed temporariy fix of BUG #1939