Error fix on functionalities.