Fixed #9 properly.