v1.0.7.248 - attemt to fix issues #618 and #621