CON-1446 | what a surprise, it's a fix for fix...