Add changes made by okliv to fix issue 1 in source repository