Fixes Dan's bullshit