favourite mapper - fix