Service Graph for JVM Memory - Heap and Nonheap Graph missing since Update to 2.0 and later

Hello, since we updated from 1.6p22 to 2.0 and all later versions (up to 2.0.0p3), the Service Graph Window is missing the separate Graphs for Heap and Nonheap Memory. As the combined Graph is working fine, I guess the Data needed is available from the Agent Output.

Is there something I could modify to get that fixed?