Fix behaviour for poppy
0.2.2