Fix define + demo