Attempting bug fix.