Fix to allow it work out of the box