Fixed James' errors