Make readonly property more robust