Fix for DEFINE