fixing errors caused by merging old branch