More regression fixing
No console
beauty
regression