fixed requet handler