[#6] Implemented a workaround in the waiting to fix this bug