new mapping scheme seems to be working now