attempted fix for #17