Moar bug fixing.