quick hack to try out issue #30