Quick fix committed, however, if we can fix it, there will be more versions