Corrected small bug related with last commit