Previous fix broke things worse