Attempting a bug fix
Attempting bug fix.