#134 currentMessage -> currentRequest