quick hack fix for #192