Completely fixed https://github.com/xyl0n/iris/issues/18 in a sort of hacky way. It may have implications.
Reverted changes in previous commit, they messed up everything