System bug fixed