Bug fix, currently am unsure how- will bisect later?