FIX: Fixing inverse calculations