Fix undefined var notice caused by merge