findOrCreate instead of new, fixes #54