More degugging