Fixed selfcontained payload bug