Fixing James' craziness