really fixing the ugly this time