Made Step a dependency again and fixed a critical bug
Fixed a bug when calling _finally function