Fixed boottime bug