Fix setting gets overwritten #1

and workaround for not renamed