Better no limit name

@nudded Can this be done nicer?