Fixed James' problem