Fixed .then