Fix for mapper