WP-878 Bug fixed