Actually fix bug from 16eb4ed3b8e3efc30bccde62655782d631b35b91