Trala, trying to fix bugs