Tweak for bug #7360.  Changed the hard coded min and max to variables.