Bugfix for NON requests