Second attempt to fix melpa build error