bug fixed at master