[BUG #2085] Solved