This is an update to the previous commit ( for the same bug ) d3a26738b426846ee1a787e7c97280fc43002961
