James' fixes