last fix... version 2.0