Small bug fix with agent bootstrap