Fixed #43, should effectively work the same as before

There were a few issues, for some reason it would automatically return false.