Update 0.5.8 Patch 2