Static adapter bug fixed