Fixing problem in earlier version