Fixed bug 1 for me, added bug 1 for Tim