Really quick fix for #2. Might want to optimize later.