Fixed bad container index bug
CS