Fixed readonly logic