[0.6.55] modify macro to make it regular statement