Fixed issues with creating