quick performance fix and resolution workaround for a project, not to be merged to stable master