Temporary fix for ST2 (Issue #14)