Fixed issue for core update. Fixes #4