#1 Fixing the bug.