Put workaround in a more appropriate place