Fix for http race