Fixed splicing issue