fixed slicing
Merge commit 'f1c6663d5bfe4f8ce41e467557a61efd107f9134' into separate