Re #1257 Introducing MAX_LIMIT.