fixed errors by @Dotile