Small Fix to First working version