final fix for now, i hope