functionalities bug fixed