Reverted 1 change to fix jMap