Fix workspace problem for related records #37