Fix to make it work