fixed errors caused by previous change