Removed dumb mapping for jj