Fixed issue with underscored relation names