added workaround for the +++ bug