Bug(s) fix