fixed bug. end of changes