ISSUE #18 - Inversion partially working