Fixed #61 again.