307 workaround update....