Fix for non-POST requests