Quick fix for relationships