6.1 Bugs fix