Fixing Marcus's bug.