Issue #3: Fix for previous commit