#344 Fix

Hi! I think, that fixes the #344.

I don't know what to do with versions 12 and 13, because to include them, corresponding features need to be ported and unfortunately I'm unable to do that at the moment.