Merged PR72 fix.