Fixes some other cases from 0266b3b4ae9124548b14e1aef0ef08798a5da465