WIP FIX: Inverse calculations with patch info

Related to #433.