works both on 0.10 and 0.11