fix any bugs in 4.2