added temporary fix for create bug