Fixed double wall issues