Tip and a minor Bug