FIX: Fixed broken hash handling with own implementation