PDM-3 Added a quick fix for upper bounds