Fixing the last bug