Client request fix