WP-840 bug fixed