Fixed my previous fix with types in comparisons
Merge branch 'master' of github.com:em-mo/TDDB44