A bit of debugging and fixed missed change during update