fixed dirty issues