further bug fixed