Fixed #128 and updated behaviour to be a bit more logical (not 100% logical yet)