Should fix one bug and create another (Also build test, will fix the remaining bug after this)