POST handling fixed