Calling camera's fill only when it needed - issue #502