Fixed locally, I'll commit it after all changes are done.