Issue #3: Reverted invalid previous commit