#1132 Fix references