Some changes should fix things