Readonly and fixing previous' fix