Fix for #169, does no harm for other apps