Fixed #61. Forever. Period.