bug fixes for optimised cascade