Update code based on orchestral/support@1d5febb

Signed-off-by: crynobone <crynobone@gmail.com>