temporary fix for Issue #17