Issue #14: Still debugging...