Partial fix for #67