WP-1397, WP-1411 - Fixed