No bug - Beautify fixes