Quick fix for #61