Quick and Lazy almost fix of #2 ...