Merge branch 'Ferada-fix-determinants'