fixing bugs for Glass
GI bug fixing