ported to pulsar 0.8