Fixed bug 4 from Tim. Added bug 4 for Tim.