KRS temp fix