Some progress on solving the issue, but not solved entirely