Bug 453

Reproducing the commit https://github.com/qcubed/framework/commit/5f00aaabca863546c953c482e080818cf2430c61 for the alpha-3.0 branch