Speed fix after 4 years :)