Partial fix for #27