Fix for elpa compatibility