Fix from Ilian

Signed-off-by: Vasil Ivanov <vivanov@plda.com>