Fixed this up for sanity