fixed bug with mixed content