122bc73 hack for #4