fix for #9 complete