Fixed bug with empty content