Fixed issue with immutability