Fixing the issues raised by @ebidel