One more fix to fully support create