Fixed EMPTY and DROP