[#009] Seems like previous commit didn't actually help (again) and this fix is better.