Working through bug