cleaned up bug 3