FIX: Making inverse calculation more consistent