Fix to alpaca + editor