Workaround I found that works