Feature/fix mysql