#3389 - I think this should do the workaround