fixes #1178 for the 3.0.x line - also related to #1100 for later versions of the framework