resolve bugs
Temp Bug resolution