Fix for additional arguments to ByMap functions