One more fix from Zaknarfen