One last debug before stabilization