[Fix]: Proposed solution for issue #988