Fixed fromJSON