debug fixing