Crude fix for issue #121