Fixing the previous failed attempt