Fix for PR/413: