Fixed pk related issue