Hopefully fixes #56 for real
-Also removed debug