Apply https://github.com/persvr/perstore/pull/47