Fixing ticket #293
Update.