v 2.2 - bug removed