fixed bug one of two