More dirty work-arounds