Fixing http handler