Fix setting defualt values