#1676: Added a fix.