is there a work around I can put into place? until 6.5.1