quick and partial fix for #3.