put the workaround in it's own file