Fixed loggin
merged