Fix: error due to new usage of .EX/EE