fix for #27
attempt to fix #26