Fixed #48.
More fixes.