CORE: fix for 48fb31539c46673da9051e2accb31db1d856656e