Add better work around