Setup bug fixed