Finally fixed create_entry