Fix to work properly