Solved decomposition issue (and reverted to previous method)