fixing same 2 times