- minor bug and performance fix