Apply a trick suggested by @xuwei-k

Signed-off-by: Gary Pamparà <gpampara@gmail.com>