Fixed PL-112
 - patch not included into previous commit