Fixed #PL-92