Fixed #4. Everything works :)