bug fixed, thisav not yet tested