Temporary fix for RIPD-291