Fix for GNU ELPA