Fix for pivotal.el