More fix on Camera