Commit fix for really weird casting bug in virtuoso