COR-289: Fix re-applied since this regression is more a bug in forum