Fixed body length issue