Woring on content stating
Fix for issue 773