Fixing the fails