Fixes #135, #136 Co-authored-by: Commentator2.0 <lix@crystal-cavern.systems> Change-Id: Ia1880633c1ee3b9242487fbc30b6d781d88987fb