added safety check in case something changes in the core func we are using