fixed bug introduced bugs