fixed for new swap map setup