ok, this is last...minor bug fixed