Quick hack to debug an issue (#43)