bugfixes, removed instanceof because it's broken sometimes
0.0.44