Fixed camera to work with new window interface