Bug fixes for reuse objects option