Bugs resolution after last code restructuring.