Fix for automatic step context run