Move workaround to bottom of file
Allow callbacks to be set to "nothing"