Ported to 0.5.2