Additional fix to 4a625d0