[fix] fixes for dirty()