bug fixed in master code