Fixing Andrzej's comments