smart fixes 32