Temporary fix for final id generation