Bug fix! help us obiwan