final bug fixed