fix #24 and also fix #25
fix #24 and also fix #25

leon776/Prepros,bitbitdecker/Prepros,leon776/Prepros,Subash/Prepros,bitbitdecker/Prepros,Subash/Prepros,bitbitdecker/Prepros,leon776/Prepros,Subash/Prepros