fix for #6, maybe