Can you remove the commented-out code? It's in other places too.