feature #1664: Fix plots