DEFINES FIX - PROPER