Fix to separate