Ported to derby 0.6