Fixing subject change check