Fixed initial local issue