Fixed defaults bug