Fix double content
Fix port to 1026