Quick hack to make it work with hasOne relationship