Bug17521

Fixes the bug described here: https://bugs.dojotoolkit.org/ticket/17521