Fix content-type bug
Merge pull request #1631 from CarlosManias/fix-content-type-bug

Fix content-type bug. Closes #1629 and #1630