Promise fixed and better minimized