Fixed by 2s issue