fix creation bugs