merging with master to fixe GET error