Fix #6 again. :P