Better(ish) fix for complain