Content sharing - Another quick fix