Fix request mapping