Hack in untested beforeShow support