A hackish attempt at step into