Core/Defines: Fixes #454