Updated with workaround.