Fix issue #167

Also handle another faulty "rake" commit ...