Fixed bug in using get_or_create