Partial fix for #148