Temp fix for issue #8.