Fixed bug Andrew & I noticed.