Fixed plotting