fixed for new changes