FIX: Better fixes coverage