Fixing plotting