possible bugs fixed
bug fixed