Previous fix wasn't good enough