Fix #3 correctly this time