basic fix for #6