Feature/warn fixing