#21 Fix response on action