Bugfix & review read-only