2.04.0:zeress:156 Yet another history fix