[griff] r4 Fixed bugs