Fix for contentType is set to null wrongly