Fixed numberical copying
Made props nullable again