fixed bug issues (2)