RO bug fix caused by RW optimization code