unfork Camera, my changes have been merged upstream