Resolve stupid select and terminate issues