partial fix for #14 - needs more config