Resolved issues with handling of :has_one associations