Slightly less quick fix.