Didn't quite get the Content-Type bug fixed