Revert "Revert commit update to avoid gcc compiler bug."

This reverts commit 2b7ab4632b7b147dd54d4efffb63d7b26633cfea.
v0.0.8