Removed some warning