Fix plots

@petya2164 should this be merged?