Do not need this fix anymore