Fix for ~167

Just a couple more, :)