fixing callbacks for .waits()