tweak for broader compatibility