Fixed #5 properly this time.