Issue #28. Restoring accidentally deleted code