Fixing PK violation - second try