BUG-12830 SOLVED