Fixed plotting macro style