Split step bug fix