Really fix #3, remove goto's