Address bug fixed