Small fix, though things still don't work 100%