Fixed James' problems