fixed bug issues